From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Thu, 21 Jun 2018 20:08:56 +0000 (-0400)
Subject: Fix Special:Userrights temp groups with no non-temp groups
X-Git-Tag: 1.34.0-rc.0~4998^2
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=dd22587268f1ec5ae820a6c40c4d5ab8133f7ed1;p=lhc%2Fweb%2Fwiklou.git

Fix Special:Userrights temp groups with no non-temp groups

Special:Userrights was only checking the count of non-temporary groups
when deciding whether to show the list of temporary and non-temporary
groups. It needs to check both.

Bug: T197860
Change-Id: Ie8a9caad01f1a610584fb4a1272ad3800e9c8e6a
---

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 22c6afeefd..0a35178db7 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -658,7 +658,7 @@ class UserrightsPage extends SpecialPage {
 			)->escaped();
 
 		$grouplist = '';
-		$count = count( $list );
+		$count = count( $list ) + count( $tempList );
 		if ( $count > 0 ) {
 			$grouplist = $this->msg( 'userrights-groupsmember' )
 				->numParams( $count )